From ed8c3743ef8c2c929e1a3ecf6275b6f9eba2c4e1 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Wed, 11 Jul 2018 14:37:54 +0200 Subject: [PATCH] ARM platforms: Remove some duplicate declarations The plat_arm_mmap variable is already declared in plat_arm.h, which is included from plat/arm/common/arm_common.c. Similarly, plat_arm.h declares the 'plat_arm_psci_pm_ops' variable, which does not need to be declared again in plat/arm/common/arm_pm.c. The duplication was not compliant with MISRA rule 8.5. Change-Id: Icc42547cc025023226b1078a7ec4f06d093364b7 Signed-off-by: Sandrine Bailleux --- plat/arm/common/arm_common.c | 2 -- plat/arm/common/arm_pm.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index 32fd9ee6..270abb2b 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -14,8 +14,6 @@ #include #include -extern const mmap_region_t plat_arm_mmap[]; - /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak plat_get_ns_image_entrypoint #pragma weak plat_arm_get_mmap diff --git a/plat/arm/common/arm_pm.c b/plat/arm/common/arm_pm.c index 4632099e..4fdb10a5 100644 --- a/plat/arm/common/arm_pm.c +++ b/plat/arm/common/arm_pm.c @@ -17,9 +17,6 @@ /* Allow ARM Standard platforms to override this function */ #pragma weak plat_arm_psci_override_pm_ops -/* Standard ARM platforms are expected to export plat_arm_psci_pm_ops */ -extern plat_psci_ops_t plat_arm_psci_pm_ops; - #if ARM_RECOM_STATE_ID_ENC extern unsigned int arm_pm_idle_states[]; #endif /* __ARM_RECOM_STATE_ID_ENC__ */ -- 2.30.2